Call setlocale().

2007-01-02  Matthias Clasen  <mclasen@redhat.com>

        * gtk/updateiconcache.c (main): Call setlocale().

        * gtk/gtkfilesel.c:
        * gtk/gtkfilesystemunix.c:
        * gtk/gtkfilesystemwin32.c:
        * gtk/gtkfilechoosersettings.c:
        * gtk/updateiconcache.c: Consistently use folder instead of
        directory in translated messages.  (#344584, Javier F. Serrador)

svn path=/trunk/; revision=17024

diff --git a/ChangeLog b/ChangeLog
index ef1b7988b04217c1670c0823d4149125fec63026..669824d289308c92b2532689a3836fd46931ee1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-01-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/updateiconcache.c (main): Call setlocale().
+
+       * gtk/gtkfilesel.c:
+       * gtk/gtkfilesystemunix.c:
+       * gtk/gtkfilesystemwin32.c:
+       * gtk/gtkfilechoosersettings.c:
+       * gtk/updateiconcache.c: Consistently use folder instead of
+       directory in translated messages.  (#344584, Javier F. Serrador)
+
 2007-01-02  Matthias Clasen  <mclasen@redhat.com>
 
        Try to fix #315732, reported by Luke Hutchinson:

diff --git a/gtk/gtkfilechoosersettings.c b/gtk/gtkfilechoosersettings.c
index 1644eccf970ee7e682305ed0f73f4fc1b6135cd1..e7026b9eb4ffd1562289a9cb4c227cca24272f07 100644 (file)
--- a/gtk/gtkfilechoosersettings.c
+++ b/gtk/gtkfilechoosersettings.c
@@ -513,8 +513,8 @@ _gtk_file_chooser_settings_save (GtkFileChooserSettings *settings,
          g_set_error (error,
                       G_FILE_ERROR,
                       g_file_error_from_errno (saved_errno),
-                      _("Could not create directory: %s"),
-                      dirname);
+                      _("Error creating folder '%s': %s"),
+                      dirname, g_strerror (saved_errno));
          goto out;
        }
 

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 4cd5ee503758569e0bcef1667ea262748d060053..84090d1060e7fe297a10759495649ef120a4e5b5 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -1405,7 +1405,7 @@ gtk_file_selection_create_dir_confirmed (GtkWidget *widget,
       if (g_error_matches (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE))
        buf = g_strdup_printf (_("The folder name \"%s\" contains symbols that are not allowed in filenames"), dirname);
       else
-       buf = g_strdup_printf (_("Error creating directory '%s': %s"), 
+       buf = g_strdup_printf (_("Error creating folder '%s': %s"), 
                               dirname, error->message);
       gtk_file_selection_fileop_error (fs, buf);
       g_error_free (error);
@@ -1414,7 +1414,7 @@ gtk_file_selection_create_dir_confirmed (GtkWidget *widget,
 
   if (g_mkdir (sys_full_path, 0777) < 0)
     {
-      buf = g_strdup_printf (_("Error creating directory '%s': %s"), 
+      buf = g_strdup_printf (_("Error creating folder '%s': %s"), 
                             dirname, g_strerror (errno));
       gtk_file_selection_fileop_error (fs, buf);
     }

diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 618df2ef7c2033ed6ec7ff82214aa00d08f5fb0c..3df49323159420e3d5a11161485f07619b8c518c 100644 (file)
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -1044,7 +1044,7 @@ gtk_file_system_unix_create_folder (GtkFileSystem                     *file_syst
       g_set_error (&error,
                   GTK_FILE_SYSTEM_ERROR,
                   GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-                  _("Error creating directory '%s': %s"),
+                  _("Error creating folder '%s': %s"),
                   display_name,
                   g_strerror (save_errno));
       

diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c
index 2b3c98ab59f1449d427911a33e7fc35075f7203c..a28a7446f331c2f0f47a4dea93244ff4eea6b745 100644 (file)
--- a/gtk/gtkfilesystemwin32.c
+++ b/gtk/gtkfilesystemwin32.c
@@ -1161,7 +1161,7 @@ gtk_file_system_win32_create_folder (GtkFileSystem                    *file_syst
       g_set_error (&error,
                   GTK_FILE_SYSTEM_ERROR,
                   GTK_FILE_SYSTEM_ERROR_NONEXISTENT,
-                  _("Error creating directory '%s': %s"),
+                  _("Error creating folder '%s': %s"),
                   display_filename,
                   g_strerror (save_errno));
       

diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index f19d03c9c3f6ab058ae762bd384ec53cfc7521da..f679b6dc9b1506ae35e8f215bf787b66534358ce 100644 (file)
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -1125,7 +1125,7 @@ write_file (FILE *cache, GHashTable *files, GList *directories)
 
   if (!write_dir_index (cache, new_offset, directories))
     {
-      g_printerr (_("Failed to write directory index\n"));
+      g_printerr (_("Failed to write folder index\n"));
       return FALSE;
     }
   
@@ -1296,6 +1296,8 @@ main (int argc, char **argv)
   if (argc < 2)
     return 0;
   
+  setlocale (LC_ALL, "");
+
   bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");